Update syntax

[rbdr/map] / Map / Presentation / Base Components / MapRender / MapVertices.swift

diff --git a/Map/Presentation/Base Components/MapRender/MapVertices.swift b/Map/Presentation/Base Components/MapRender/MapVertices.swift
index 74cac6d6ccb4b171e426cc4b93dae740dae034d5..5bc0a967aef078789bbf1bd1a56aa9f05d898e9a 100644 (file)
--- a/Map/Presentation/Base Components/MapRender/MapVertices.swift
+++ b/Map/Presentation/Base Components/MapRender/MapVertices.swift
@@ -7,18 +7,29 @@ struct MapVertices: View {
   let vertices: [Vertex]
   let padding = CGFloat(5.0)
 
   let vertices: [Vertex]
   let padding = CGFloat(5.0)
 

+  var onDragVertex: (Vertex, CGFloat, CGFloat) -> Void = { _, _, _ in }
+

   var body: some View {
     ZStack(alignment: .topLeading) {
       ForEach(vertices, id: \.id) { vertex in
   var body: some View {
     ZStack(alignment: .topLeading) {
       ForEach(vertices, id: \.id) { vertex in

-        getVertexShape(vertex).fill(Color.map.vertexColor)
-        Text(vertex.label.replacingOccurrences(of: "\\n", with: "\n")).font(.theme.vertexLabel)
+        ZStack(alignment: .topLeading) {
+          getVertexShape(vertex).fill(Color.map.vertexColor)
+          Text(vertex.label.replacingOccurrences(of: "\\n", with: "\n")).font(.theme.vertexLabel)

             .foregroundColor(.map.labelColor)
             .shadow(color: .white, radius: 0, x: -0.5, y: -0.5)
             .shadow(color: .white, radius: 0, x: 0.5, y: 0.5)
             .offset(
             .foregroundColor(.map.labelColor)
             .shadow(color: .white, radius: 0, x: -0.5, y: -0.5)
             .shadow(color: .white, radius: 0, x: 0.5, y: 0.5)
             .offset(

-          CGSize(
-            width: w(vertex.position.x) + vertexSize.width + padding,
-            height: h(vertex.position.y) + 7.0))
+              CGSize(
+                width: w(vertex.position.x) + vertexSize.width + padding,
+                height: h(vertex.position.y) + 7.0))
+        }.gesture(
+          DragGesture()
+            .onChanged { value in
+              let deltaX = value.startLocation.x - value.location.x
+              let deltaY = value.startLocation.y - value.location.y
+              onDragVertex(vertex, deltaX, deltaY)
+            }
+        )

       }
     }
   }
       }
     }
   }


@@ -78,15 +89,13 @@ struct MapVertices: View {
   }
 }
 
   }
 }
 

-struct MapVertices_Previews: PreviewProvider {
-  static var previews: some View {
-      MapVertices(
-        mapSize: CGSize(width: 400.0, height: 400.0), vertexSize: CGSize(width: 25.0, height: 25.0),
-        vertices: [
-          Vertex(id: 0, label: "A Circle", position: CGPoint(x: 50.0, y: 50.0)),
-          Vertex(id: 1, label: "A Square", position: CGPoint(x: 10.0, y: 20.0), shape: .square),
-          Vertex(id: 2, label: "A triangle", position: CGPoint(x: 25, y: 32.0), shape: .triangle),
-          Vertex(id: 3, label: "An X", position: CGPoint(x: 70.0, y: 70.0), shape: .x),
-        ])
-  }
+#Preview {
+  MapVertices(
+    mapSize: CGSize(width: 400.0, height: 400.0), vertexSize: CGSize(width: 25.0, height: 25.0),
+    vertices: [
+      Vertex(id: 0, label: "A Circle", position: CGPoint(x: 50.0, y: 50.0)),
+      Vertex(id: 1, label: "A Square", position: CGPoint(x: 10.0, y: 20.0), shape: .square),
+      Vertex(id: 2, label: "A triangle", position: CGPoint(x: 25, y: 32.0), shape: .triangle),
+      Vertex(id: 3, label: "An X", position: CGPoint(x: 70.0, y: 70.0), shape: .x),
+    ])

 }
 }